FIxing minor issues in front end