Final Changes
Merge pull request #23 from gatkin/widget-layout

Final Changes