cleaned up code in home panel
Merge branch 'dev-cleanHomePanel' into dev