Added module names.
Cleaned up navigation and screens.