Made verification look more pretty and some minor adjustments