Fixes on UI of Home template