edited controller and common layout files