user exist fi and layout improvements