Cleanup, frontend bug fix