fix bugs add controls