#27 #23
Improvements for mobile