Small Design changes and deletion of keys and goals from screens with two levels