Fixed layout and navbar
Library upgrade