Tidied up deployment and build views