ui improve! yeaaaaaaah