Added medicines and refactoring links