Update 3/21/14

GUI rewrite