ui and bug fixes