dealed with default margins + view code cleanup