Changed some things in the view component