style update and layout fix attempt