Finished Major

Addes buttos, edit function, minor fixes