Fixes for mobile devices
UI imrpovements