update to somewhat functional layout