Update Build

*Could use a refactor to rename variables to make more sense for both
vertical and horizontal configurations.
*The conditionals in handler() could probably be grouped more
optimally.