UI Kit and some small redesigns