update layout and the code style