Further changes to fix layout and speed up play