Added App expanded and close functionality