Fixed navigation panel layout, and arabic numbers #TA-2115