Improves ui and update model