Fix revision, restructure styles and bugfixes