buttons are there, overall layout code quality improved

map needs listener