updated view and layout