UI
Merge branch 'update' of http://www.github.com/xaneem/lms into update