Some more work in ui and view controllers