Fix some annotations in models and add some properties to solution
Beautify UI and improve UX

Use some bootstrap classes to render buttons nicely
Use tables where it makes sense