fixing padding and marg