Added user-validation against whitelist
Changed layout and redirect if current user