Fixes and improvement to layout. #233