added exercise icon, header border, moved menu to header.
added glasses and methods to output the correct number of glasses.