Add site nickname
Add edit site action
general optimizations
Add validations