Reverted to clean style and added dividers in nav bar