Slight markup changes, functionality experiment