Design and animation fixes