Added padding and viewport