Fexed some state issues
Rename function
Better names
Better UI