Revert "Changed to activities instead of single layout files"

This reverts commit 823ba8c00526150c3d865c0da16b2f35dd6ded09.