bug fixes and Mobile UI changes