Fixed some view components