add missing methods
remove old margin