fixing menu, job list etc