Reorganize and pretty up the layouts