Added Bootstrap layouts and fixed up some features