Clean up. Also change :focus selector because clicks wouldn't work properly