Some work on some objects and layout.