Fix views & actions