Fixed collapse expand toggling and small css issue