Enhancements

Enhancing mobile UX