mega updates, removed extends, cleaned navigation, made mixins from repeadted components