clean up some, added boxing for layout