Revert "Revert "UI Improvement. Need to reconstructed""

This reverts commit 1f380fe752667bd263180bf6292584442be24572.
Revert "Revert "Bug fixed.""

This reverts commit 179f7e36be8fd7e746c64e6d315cd70f2667c48b.
Revert "Revert "Revert "Bug fixed."""

This reverts commit 22cf015a1b4182ecd455d098f01155e3435297b4.
Revert "Revert "Revert "UI Improvement. Need to reconstructed"""

This reverts commit a91773a332ff3bdb7b759a0c0f914d803a190971.
Revert "Revert "Bug fixed.""

This reverts commit 663ff75870e5000184abf9e16308e3b4877b7b20.