UI fix and changes