Made some changes to frontend