changed ui structure (reverted from commit d0d7d00a974c4c5a486c6e34a97d172ac67fb064)