Refactor models
refactor models
Add buttons
add class
minor bug fixes