Add layout and view classes