Admin strani, custom views, merged stuff from other pull requests