Mobile styles
Refactor a bit

This needs tests :/