Zalad is sorry for the bad commit :( GUI code made better in general