Added all of the things together + new css