Made major layout changes to prep for the tile layout!