frontend bug fixing