Added more options, corrected some other
Move header to the template
Many changes in styles