fixed current user issue in layout