Restructured views and widgets