bug fixes: frontend