Small fixes on frontend