Frontend bug fixes