Frontend

Merging updated frontend with updated master (all apis work)