Tweaks and first custom action (serious need of refactoring)