Changed to activities instead of single layout files