Front end bug fixes