Fix layout issues, remove schedule animations