GUI Updated
Fixed GUI Bugs and cleaned code