Improve header options button click