Bella's update for 04-19-2014
Bella's design update April 19
Merge with latest UI
Master Cleanup
Master cleanup
Merge with UI updates
cleanup