Also, if you could properly indent the whole block from line 164 to 233 and remove the blank lines at 218 & 234, the readability would improve & help in future contributions.

**Note:** Glade uses 2 spaces for indentation in ui files.