issue 135 - fix top menu