Bug 896917 - Visual polish and behavior completed