layout fixes, now ready for testing