choose Module

ne implemented: choose Module
some cleanup and layout improvements