Fix activity layout, define fragment layout