Updated some layout