Improve header, fix some issues
#900 Update index design again