fix padding and remove .none
custom build