bugfix, foreign keys, menu added