Added some modules, lots of styling