new layout from joe, still slightly broken but better than before