Improve tablet and and phone layout a bit, still sucks