Fixed issue: Admin layout fixes and minor changes