Tightened up UI. Organized code / comments