1. Navigation selection rotation bug fixed
2. Small design change