Still WIP responsive

Should fix your branch @LarryMatte 
Good job @spg -> lol