gui rework, many minor changes