cleaned up layout and navigation