changed layout naming convention to better group them together logically
updated activities etc to reflect new layout naming