Several improvements on models, views and controllers, implemented more options