Fixed typo and moved UI code into PSTheme