Added and cleaned up UI elements