Improved layout; 1.0