Cleanup main layout
merging master into ui
Main app layout
merging
client and services service