layout and animation fixes