formatting fixes
fix layout