more ui/layout work on user view and forms