UI updates and screens - to fit design