Tweaks to layout, fixed error in App. A