Fixed and improved layout of viewer-admin in various places