Added id-tags
Improved design