add controls, fix some styling issues