Total overhaul

Replaced test code with bootstrap grid system