Changed menu according to fri's suggestions
Updated favicon