View and admin side changes