Changed to point to outside Vista repository and use newer layout manager.