Adds columns
Adds bristow's fix
More dev -- basic layout is working