Fixed some layout issue