Add Bootstrap, customize CSS
Fix layout conflict with secondary branch