admin panel styling
fix merge conflict