• Remove: - React, PureComponent global import and added those imports to files directly
• Added: - NavigationBarButton component • Removed: - the component code from NavigationBar component