fixed more bugs and layouts for waypointedit now looks cleaner