Another try at moving the action to the top