Level 8 and button fixes