Input click to reveal options. And some cleanup