updated ui and bug fixes