Implemented various fixes for both desktop and mobile