Frontend

Merging a few changes to frontend