update layout and new frais working