Major updates and fixes

corrected desktop and mobile views