layout fixes and cleanup