Revert "Edited layout and navbar"

This reverts commit dcd0958a76c7a6466eb948998a7d8fdbb983948f.