Updated Views and Layouts