Added more dummy modules
Some 'metro' styling