Improve header, fix stylsheet issue