More work on user app