More Front-end fixes