Fixed Labels

Labels now use label tags and display properly.