bug fix in user and layout views