Moved to bootstrap and refactored (no styling yet though)