fix layout and includes