1 change diy-icon position
2 add top-bar menu back