Brandon: Minor changes to frontend.