Fix some details on GUI