Restructure complete
New styles and bug fixes.