boootstrap compatible, padding and overlap fixes