Assignment 2 and some more fixes

Both desktop and mobile versions tested