Cleaning up structure, breaking things
Implemented fancy confirm dialog