Fixed some rwd bug, tweak position