update layout, add logger
update models and controller