Layout fixes + cleanup
Fixed #891: Bug - Error when migrating from ispCP
Several fixes
Updated database revision
Small fixes