Style and content updates

Reorganized and cleanup markup