improved and more consistent gui