few more layout changes before moving to TMK

I will likely be moving to a TMK fork now