Fixed some layout details