Little changes to frontend