Cleaned up UI and removed logs