admin layout + some fixes