Small improvements into GUI