New Styling + Minor Changes