menu still broken... fixme!