Veruska added labels
Minor stuff
Fixes
Layout & labels