cleaned up UI and fixed bugs