Updated some of the styling

moved some files around so that hopefully updates to the framework can be applied without affecting applications.