header class and cleanup
layout fixes