renaming and better html structure