better padding and margin