More genericization
Layout fixes