+ renaming of layouts
+ added home navigation and fixed some bugs