Fixed margin and padding errors