Added some padding and margins