App and Admin improvements