Fixes #150

* Improving support for medium and small devices.
* Another little UX details