Cleaned up UI so it looks prettier