major overhaul of layout