changed labels, view data from db
minor changes