Last tweaks + added action controller