layout and user view improvements