Many UI changes and cleaned up code