layout changed
exit handler added
unittests combined