Z ordering fixes and gui change