Improve index nvaigation layout for mobile
Merge latest changes from master