Header changed and refacktoring
Eleminated more button.