Code cleanup
Make widget the parent of the layout