fixes
fix layout