updated layout: seperated views