Update layout for UI components
Merge pull request #1 from kpdecker/layout

Update layout for UI components