Bug fixes for cell spacing and navigation icons