change some logic flow
fix registration layout issue