Add staff and better UI
Add tap function