Task #167: Fixed margin and padding block
Task #167: Fix marge conflict