Fix overlay layouts to initially work. Design is still terrible.