Layout updates 

Tests are passing now.