Added padding and a test button