Added General Interface
All modals added
Added values to chart
merged
Fixed merge bugs