interim commit while fixing up layout and user views