Improved main form