Layout semi functional. Check in to share for bug fixes