todo to fix the background borders;