Fixed up layouts, added listeners