restructuring and new features, better stylesheet