Fix loading widget navigation issue
Remove extraneous  calls, tweak layout