Change refs #25 closes #26. Also screen layout