adding changes for base layout and loading activity