reverting some changed to padding variables, changes were more far reaching than expected and causes styling bugs