Clean up layout and tests