merge chris stuff, add css styling, get validation