adjust box colours and sizes
merge branch