Added UI Controls, and organized code