removed lorem ipsum and other minor ui changes
Fixed merge