some ui changes (very unstable)