Ui model added
Alignment issues fixed