More menu fix and better code
Fix bug with view of first cell