Register User Interface
Merge branch 'Dev' into UI
minor changes