Fixed #479 fixed #478 and did the same for all admin views