Add UI class; create splashscreen method
fix merge conflict
Merge branch 'dkim561-master'