Merge pull request #22 from gatkin/widget-layout

Widget layout
Final Changes