fixed BackArrow visibility and CloseButton not rotating issues