Styling and Fixed an offset bug