Last minute fixes for frontend