FIX for issue 1728. Cleaned up sidebar link generation.
Merge branch 'master' into issue-1728
Merge branch 'master' into issue-1728
FIX for issue 1728. Removed hardcoded "edit" and improved user experience.
Merge branch 'master' into issue-1728
Recommit for issue 1728. Fixed code style.
Fix for #1728. Fixed issues with indentation.
Fix for #1728. Continued fixing indentation.
Merge pull request #1750 from bmuscede/issue-1728

Fixes #1728