Improve cursor and add add button
Pushing