Organized code and fixed bootstrap css