Design layout and cleanup