Complete more of layout