General improve in model and controller
More basic features and UI