Code padding and some styles fixes