Fix invisible button being clickable
Organized files