Added some padding and working on code