Changed classes to name to avoid naming conflicts and changed navigation flow.