general layout OK
updated front end