Tweaked ui graphics and code