Theme and resizing, work on the navigation
Fixed merge conflict