Bug 1008667 Fixes

Changes made to desktop and mobile version as specified by Joni on the bug.