Cleaned up some code and started playing with bootstrap