Changed the view of some parts for Fabian