changed position for components
Merge branch 'edit' of https://github.com/simonjrp/ESCAPE into edit