restructured views/layouts