some controller, views and fixes