Align the push list at the centre
Revert the refactoring of the code and tidy somethings