Updated layout, activity classes and fragment classes