Tidied up ARMS form to look closer to the mockup