Revised function call implementation

[kh90909]

Revised previous code (commit 48b97d8) to integrate with the expandable sidebar and bring in line with the code patterns implemented in recent commits.