Several improvements on the GUI and services