Clean up UI. Start getting some screen code in order