Tidy up layout and report current state