save before branch
tidied up layout