incorporate BlockLayout - expect weird scrollbar bugs
project style corrections