Modularize and improve addition of new expenses