Added a better padding