Fixed some layout