Cleaned up UI and made improvements to app overall