development rack ui enhancement code
Merge remote-tracking branch 'remotes/origin/master' into UI-updates