Added final version of volume+refactoring. Some light changes on frontend and backend