class replacement
fix layout margins