major overhaul, horizontal mode, better design