Update 3/17/14

Cleaned up GUI code