clean up layout on line 40