Changes to simplify ui