fix few bugs and improved adminclar
fix few bugs and improved adminclar