Changed the text on switches in app and tidied the modals