added modules and collapsing menu