Cleaned up UI and code a bit