Update styles and improve navigation