More refactoring, added bootstrap more
Removed unnecessary stuff