More placeholder work. Layout bug fixes.