Attempt to combine two branches for normal and app layout
Index 2 because of odd commit issue