WIP: Fixed notifications and PaddingTop on rules