Updated todo and more view changes