Fixing navbar, removing _messages.html and several templates improvements