Added Admin section
Merged changes & added layout