Fix margins #6