fixed the padding issue
fixed padding and other stuff