Cleaning up? two #options and fix color&border error