UI change + finish page added

.