Styling and Other Bug Fixes