Added Server option to select objective and cleaned up interface