Started to rewrite controllers and views