#701 ready for styling
fixed #703