fixing layout issues, added animations