Added border to colorwheel, small tweaks