Refactorings and added new PropertyMenu library.