Fixed bugs. Some layouts were corrected.