fix mounting and add some padding