Added bootstrap, started refactoring look