Change styling layout and remove 1.5.4 support