some constraints and UI added