Attempting to fix cancel and style issues