Reworked some logic and altered the styling of a few elements