Styling cleanup/bug fixes