ui updates
ui updates, img fix
Merge branch 'ltest' into development