some small gui improvements, removed unnecessary includes