Revert "Revert "Edited layout and navbar""

This reverts commit d420187a04f20b9dded7c663297fb7182b6f0b29.