Updating API to match bootstrap grid
Updating API to match bootstrap grid. Fixes 16 Fixes 14