Minor layout changes. Methods to ensure, that an entry is unique in the database