Started adding view for admin side
merge fix