Making progress on applying layout