Changes styling and bugs