Front end fixes