merged UI in to this project