updated Instructions, trying to get UI testing to run
merged conflicts in Instructions
fixed minor problems in layout file
tests run again