Layout fixed and cleanup.