tidy up
re-arrange some stuff and add more outlets