More progress on 50/50 layout
Rearranged some things