better html structure
Work in progress