refactored layout
added control and waypoint list view