Useless code cleaning
State URL button rework