Cleaning up the UI. Stars are coming later...