#67 update layout