Using the right calc when the width returns percent.
Added option border.