Restructured part of the views