Cleaned up controllers and fixed BootStrap data set up issue.