Nette 2.1 compatibility & minor layout changes