Bug-51: UI refresh
Merge pull request #27 from thomas771020/bug-51-UI-layout-refresh

Bug-51: UI refresh