UI Revised
Merge branch 'Local'