Fixed some text and removed some views