Fix navbar and improve display