fixed some padding and align issues