fix layout and naming conventions